Avoid encoding VT via win32 input mode #16407
Conversation
lhecker
added
Product-Conpty
|
There's another bug for this as well. Mouse mode one. |
src/host/inputBuffer.cpp
Outdated
| @@ -602,6 +602,30 @@ size_t InputBuffer::Write(const std::span<const INPUT_RECORD>& inEvents) | |||
| } | |||
| } | |||
|
|
|||
| void InputBuffer::WriteDirect(const std::span<const INPUT_RECORD>& inEvents) | |||
There was a problem hiding this comment.
Instead of creating a new method for this, couldn't you just make the existing _HandleTerminalInputCallback method public, and call it with a string instead of an event list? That way you could drop all that event generation code from the ReturnResponse method, and pass the string through directly.
There was a problem hiding this comment.
Yeah, that's a good point. I'll make that change.
| ServiceLocator::LocateGlobals().hInputEvent.SetEvent(); | ||
| } | ||
|
|
||
| WakeUpReadersWaitingForData(); |
There was a problem hiding this comment.
_HandleTerminalInputCallback doesn't wake up readers if there were no bits - should we do that here?
There was a problem hiding this comment.
I was a bit afraid of outright using _HandleTerminalInputCallback, because InputBuffer::Write actually does it exactly like that: It always calls WakeUpReadersWaitingForData(). In the future, if I ever get to rewrite InputBuffer with proper string support, I was hoping to really understand how this works and to properly unify the event/wakeup code.
This changeset avoids re-encoding output from `AdaptDispatch` via the win32-input-mode mechanism when VT input is enabled. That is, an `AdaptDispatch` output like `\x1b[C` would otherwise result in dozens of characters of input. Related to #16343 ## Validation Steps Performed * Replace conhost with this * Launch a Win32 application inside WSL * ASCII keyboard inputs are represented as single `INPUT_RECORD`s ✅ (cherry picked from commit 0da37a1) Service-Card-Id: 91246942 Service-Version: 1.19
This changeset avoids re-encoding output from
AdaptDispatchvia the win32-input-mode mechanism when VT input is enabled.
That is, an
AdaptDispatchoutput like\x1b[Cwould otherwiseresult in dozens of characters of input.
Related to #16343
Validation Steps Performed
INPUT_RECORDs ✅